Merge remote-tracking branch 'stable/linux-4.9.y' into rpi-4.9.y
authorpopcornmix <popcornmix@gmail.com>
Thu, 13 Jul 2017 10:03:50 +0000 (11:03 +0100)
committerpopcornmix <popcornmix@gmail.com>
Thu, 13 Jul 2017 10:03:50 +0000 (11:03 +0100)

Trivial merge